diff --git a/entitymanager/src/java/org/hibernate/ejb/AbstractEntityManagerImpl.java b/entitymanager/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/AbstractEntityManagerImpl.java rename to entitymanager/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java diff --git a/entitymanager/src/java/org/hibernate/ejb/CurrentEntityManagerImpl.java b/entitymanager/src/main/java/org/hibernate/ejb/CurrentEntityManagerImpl.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/CurrentEntityManagerImpl.java rename to entitymanager/src/main/java/org/hibernate/ejb/CurrentEntityManagerImpl.java diff --git a/entitymanager/src/java/org/hibernate/ejb/Ejb3Configuration.java b/entitymanager/src/main/java/org/hibernate/ejb/Ejb3Configuration.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/Ejb3Configuration.java rename to entitymanager/src/main/java/org/hibernate/ejb/Ejb3Configuration.java diff --git a/entitymanager/src/java/org/hibernate/ejb/Ejb3ConfigurationObjectFactory.java b/entitymanager/src/main/java/org/hibernate/ejb/Ejb3ConfigurationObjectFactory.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/Ejb3ConfigurationObjectFactory.java rename to entitymanager/src/main/java/org/hibernate/ejb/Ejb3ConfigurationObjectFactory.java diff --git a/entitymanager/src/java/org/hibernate/ejb/EntityManagerFactoryImpl.java b/entitymanager/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/EntityManagerFactoryImpl.java rename to entitymanager/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java diff --git a/entitymanager/src/java/org/hibernate/ejb/EntityManagerImpl.java b/entitymanager/src/main/java/org/hibernate/ejb/EntityManagerImpl.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/EntityManagerImpl.java rename to entitymanager/src/main/java/org/hibernate/ejb/EntityManagerImpl.java diff --git a/entitymanager/src/java/org/hibernate/ejb/EventListenerConfigurator.java b/entitymanager/src/main/java/org/hibernate/ejb/EventListenerConfigurator.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/EventListenerConfigurator.java rename to entitymanager/src/main/java/org/hibernate/ejb/EventListenerConfigurator.java diff --git a/entitymanager/src/java/org/hibernate/ejb/HibernateEntityManager.java b/entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManager.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/HibernateEntityManager.java rename to entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManager.java diff --git a/entitymanager/src/java/org/hibernate/ejb/HibernateEntityManagerFactory.java b/entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManagerFactory.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/HibernateEntityManagerFactory.java rename to entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManagerFactory.java diff --git a/entitymanager/src/java/org/hibernate/ejb/HibernateEntityManagerImplementor.java b/entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManagerImplementor.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/HibernateEntityManagerImplementor.java rename to entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManagerImplementor.java diff --git a/entitymanager/src/java/org/hibernate/ejb/HibernatePersistence.java b/entitymanager/src/main/java/org/hibernate/ejb/HibernatePersistence.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/HibernatePersistence.java rename to entitymanager/src/main/java/org/hibernate/ejb/HibernatePersistence.java diff --git a/entitymanager/src/java/org/hibernate/ejb/HibernateQuery.java b/entitymanager/src/main/java/org/hibernate/ejb/HibernateQuery.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/HibernateQuery.java rename to entitymanager/src/main/java/org/hibernate/ejb/HibernateQuery.java diff --git a/entitymanager/src/java/org/hibernate/ejb/InjectionSettingsFactory.java b/entitymanager/src/main/java/org/hibernate/ejb/InjectionSettingsFactory.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/InjectionSettingsFactory.java rename to entitymanager/src/main/java/org/hibernate/ejb/InjectionSettingsFactory.java diff --git a/entitymanager/src/java/org/hibernate/ejb/QueryImpl.java b/entitymanager/src/main/java/org/hibernate/ejb/QueryImpl.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/QueryImpl.java rename to entitymanager/src/main/java/org/hibernate/ejb/QueryImpl.java diff --git a/entitymanager/src/java/org/hibernate/ejb/TransactionImpl.java b/entitymanager/src/main/java/org/hibernate/ejb/TransactionImpl.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/TransactionImpl.java rename to entitymanager/src/main/java/org/hibernate/ejb/TransactionImpl.java diff --git a/entitymanager/src/java/org/hibernate/ejb/Version.java b/entitymanager/src/main/java/org/hibernate/ejb/Version.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/Version.java rename to entitymanager/src/main/java/org/hibernate/ejb/Version.java diff --git a/entitymanager/src/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java b/entitymanager/src/main/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java rename to entitymanager/src/main/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java diff --git a/entitymanager/src/java/org/hibernate/ejb/event/BeanCallback.java b/entitymanager/src/main/java/org/hibernate/ejb/event/BeanCallback.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/event/BeanCallback.java rename to entitymanager/src/main/java/org/hibernate/ejb/event/BeanCallback.java diff --git a/entitymanager/src/java/org/hibernate/ejb/event/Callback.java b/entitymanager/src/main/java/org/hibernate/ejb/event/Callback.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/event/Callback.java rename to entitymanager/src/main/java/org/hibernate/ejb/event/Callback.java diff --git a/entitymanager/src/java/org/hibernate/ejb/event/CallbackHandlerConsumer.java b/entitymanager/src/main/java/org/hibernate/ejb/event/CallbackHandlerConsumer.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/event/CallbackHandlerConsumer.java rename to entitymanager/src/main/java/org/hibernate/ejb/event/CallbackHandlerConsumer.java diff --git a/entitymanager/src/java/org/hibernate/ejb/event/CallbackResolver.java b/entitymanager/src/main/java/org/hibernate/ejb/event/CallbackResolver.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/event/CallbackResolver.java rename to entitymanager/src/main/java/org/hibernate/ejb/event/CallbackResolver.java diff --git a/entitymanager/src/java/org/hibernate/ejb/event/EJB3AutoFlushEventListener.java b/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3AutoFlushEventListener.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/event/EJB3AutoFlushEventListener.java rename to entitymanager/src/main/java/org/hibernate/ejb/event/EJB3AutoFlushEventListener.java diff --git a/entitymanager/src/java/org/hibernate/ejb/event/EJB3DeleteEventListener.java b/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3DeleteEventListener.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/event/EJB3DeleteEventListener.java rename to entitymanager/src/main/java/org/hibernate/ejb/event/EJB3DeleteEventListener.java diff --git a/entitymanager/src/java/org/hibernate/ejb/event/EJB3FlushEntityEventListener.java b/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3FlushEntityEventListener.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/event/EJB3FlushEntityEventListener.java rename to entitymanager/src/main/java/org/hibernate/ejb/event/EJB3FlushEntityEventListener.java diff --git a/entitymanager/src/java/org/hibernate/ejb/event/EJB3FlushEventListener.java b/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3FlushEventListener.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/event/EJB3FlushEventListener.java rename to entitymanager/src/main/java/org/hibernate/ejb/event/EJB3FlushEventListener.java diff --git a/entitymanager/src/java/org/hibernate/ejb/event/EJB3MergeEventListener.java b/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3MergeEventListener.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/event/EJB3MergeEventListener.java rename to entitymanager/src/main/java/org/hibernate/ejb/event/EJB3MergeEventListener.java diff --git a/entitymanager/src/java/org/hibernate/ejb/event/EJB3PersistEventListener.java b/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PersistEventListener.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/event/EJB3PersistEventListener.java rename to entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PersistEventListener.java diff --git a/entitymanager/src/java/org/hibernate/ejb/event/EJB3PersistOnFlushEventListener.java b/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PersistOnFlushEventListener.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/event/EJB3PersistOnFlushEventListener.java rename to entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PersistOnFlushEventListener.java diff --git a/entitymanager/src/java/org/hibernate/ejb/event/EJB3PostDeleteEventListener.java b/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostDeleteEventListener.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/event/EJB3PostDeleteEventListener.java rename to entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostDeleteEventListener.java diff --git a/entitymanager/src/java/org/hibernate/ejb/event/EJB3PostInsertEventListener.java b/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostInsertEventListener.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/event/EJB3PostInsertEventListener.java rename to entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostInsertEventListener.java diff --git a/entitymanager/src/java/org/hibernate/ejb/event/EJB3PostLoadEventListener.java b/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostLoadEventListener.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/event/EJB3PostLoadEventListener.java rename to entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostLoadEventListener.java diff --git a/entitymanager/src/java/org/hibernate/ejb/event/EJB3PostUpdateEventListener.java b/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostUpdateEventListener.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/event/EJB3PostUpdateEventListener.java rename to entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostUpdateEventListener.java diff --git a/entitymanager/src/java/org/hibernate/ejb/event/EJB3SaveEventListener.java b/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3SaveEventListener.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/event/EJB3SaveEventListener.java rename to entitymanager/src/main/java/org/hibernate/ejb/event/EJB3SaveEventListener.java diff --git a/entitymanager/src/java/org/hibernate/ejb/event/EJB3SaveOrUpdateEventListener.java b/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3SaveOrUpdateEventListener.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/event/EJB3SaveOrUpdateEventListener.java rename to entitymanager/src/main/java/org/hibernate/ejb/event/EJB3SaveOrUpdateEventListener.java diff --git a/entitymanager/src/java/org/hibernate/ejb/event/EntityCallbackHandler.java b/entitymanager/src/main/java/org/hibernate/ejb/event/EntityCallbackHandler.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/event/EntityCallbackHandler.java rename to entitymanager/src/main/java/org/hibernate/ejb/event/EntityCallbackHandler.java diff --git a/entitymanager/src/java/org/hibernate/ejb/event/ListenerCallback.java b/entitymanager/src/main/java/org/hibernate/ejb/event/ListenerCallback.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/event/ListenerCallback.java rename to entitymanager/src/main/java/org/hibernate/ejb/event/ListenerCallback.java diff --git a/entitymanager/src/java/org/hibernate/ejb/instrument/InterceptFieldClassFileTransformer.java b/entitymanager/src/main/java/org/hibernate/ejb/instrument/InterceptFieldClassFileTransformer.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/instrument/InterceptFieldClassFileTransformer.java rename to entitymanager/src/main/java/org/hibernate/ejb/instrument/InterceptFieldClassFileTransformer.java diff --git a/entitymanager/src/java/org/hibernate/ejb/packaging/AbstractJarVisitor.java b/entitymanager/src/main/java/org/hibernate/ejb/packaging/AbstractJarVisitor.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/packaging/AbstractJarVisitor.java rename to entitymanager/src/main/java/org/hibernate/ejb/packaging/AbstractJarVisitor.java diff --git a/entitymanager/src/java/org/hibernate/ejb/packaging/ClassFilter.java b/entitymanager/src/main/java/org/hibernate/ejb/packaging/ClassFilter.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/packaging/ClassFilter.java rename to entitymanager/src/main/java/org/hibernate/ejb/packaging/ClassFilter.java diff --git a/entitymanager/src/java/org/hibernate/ejb/packaging/Entry.java b/entitymanager/src/main/java/org/hibernate/ejb/packaging/Entry.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/packaging/Entry.java rename to entitymanager/src/main/java/org/hibernate/ejb/packaging/Entry.java diff --git a/entitymanager/src/java/org/hibernate/ejb/packaging/ExplodedJarVisitor.java b/entitymanager/src/main/java/org/hibernate/ejb/packaging/ExplodedJarVisitor.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/packaging/ExplodedJarVisitor.java rename to entitymanager/src/main/java/org/hibernate/ejb/packaging/ExplodedJarVisitor.java diff --git a/entitymanager/src/java/org/hibernate/ejb/packaging/FileFilter.java b/entitymanager/src/main/java/org/hibernate/ejb/packaging/FileFilter.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/packaging/FileFilter.java rename to entitymanager/src/main/java/org/hibernate/ejb/packaging/FileFilter.java diff --git a/entitymanager/src/java/org/hibernate/ejb/packaging/FileZippedJarVisitor.java b/entitymanager/src/main/java/org/hibernate/ejb/packaging/FileZippedJarVisitor.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/packaging/FileZippedJarVisitor.java rename to entitymanager/src/main/java/org/hibernate/ejb/packaging/FileZippedJarVisitor.java diff --git a/entitymanager/src/java/org/hibernate/ejb/packaging/Filter.java b/entitymanager/src/main/java/org/hibernate/ejb/packaging/Filter.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/packaging/Filter.java rename to entitymanager/src/main/java/org/hibernate/ejb/packaging/Filter.java diff --git a/entitymanager/src/java/org/hibernate/ejb/packaging/InputStreamZippedJarVisitor.java b/entitymanager/src/main/java/org/hibernate/ejb/packaging/InputStreamZippedJarVisitor.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/packaging/InputStreamZippedJarVisitor.java rename to entitymanager/src/main/java/org/hibernate/ejb/packaging/InputStreamZippedJarVisitor.java diff --git a/entitymanager/src/java/org/hibernate/ejb/packaging/JarProtocolVisitor.java b/entitymanager/src/main/java/org/hibernate/ejb/packaging/JarProtocolVisitor.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/packaging/JarProtocolVisitor.java rename to entitymanager/src/main/java/org/hibernate/ejb/packaging/JarProtocolVisitor.java diff --git a/entitymanager/src/java/org/hibernate/ejb/packaging/JarVisitor.java b/entitymanager/src/main/java/org/hibernate/ejb/packaging/JarVisitor.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/packaging/JarVisitor.java rename to entitymanager/src/main/java/org/hibernate/ejb/packaging/JarVisitor.java diff --git a/entitymanager/src/java/org/hibernate/ejb/packaging/JarVisitorFactory.java b/entitymanager/src/main/java/org/hibernate/ejb/packaging/JarVisitorFactory.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/packaging/JarVisitorFactory.java rename to entitymanager/src/main/java/org/hibernate/ejb/packaging/JarVisitorFactory.java diff --git a/entitymanager/src/java/org/hibernate/ejb/packaging/JavaElementFilter.java b/entitymanager/src/main/java/org/hibernate/ejb/packaging/JavaElementFilter.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/packaging/JavaElementFilter.java rename to entitymanager/src/main/java/org/hibernate/ejb/packaging/JavaElementFilter.java diff --git a/entitymanager/src/java/org/hibernate/ejb/packaging/NamedInputStream.java b/entitymanager/src/main/java/org/hibernate/ejb/packaging/NamedInputStream.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/packaging/NamedInputStream.java rename to entitymanager/src/main/java/org/hibernate/ejb/packaging/NamedInputStream.java diff --git a/entitymanager/src/java/org/hibernate/ejb/packaging/PackageFilter.java b/entitymanager/src/main/java/org/hibernate/ejb/packaging/PackageFilter.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/packaging/PackageFilter.java rename to entitymanager/src/main/java/org/hibernate/ejb/packaging/PackageFilter.java diff --git a/entitymanager/src/java/org/hibernate/ejb/packaging/PersistenceMetadata.java b/entitymanager/src/main/java/org/hibernate/ejb/packaging/PersistenceMetadata.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/packaging/PersistenceMetadata.java rename to entitymanager/src/main/java/org/hibernate/ejb/packaging/PersistenceMetadata.java diff --git a/entitymanager/src/java/org/hibernate/ejb/packaging/PersistenceXmlLoader.java b/entitymanager/src/main/java/org/hibernate/ejb/packaging/PersistenceXmlLoader.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/packaging/PersistenceXmlLoader.java rename to entitymanager/src/main/java/org/hibernate/ejb/packaging/PersistenceXmlLoader.java diff --git a/entitymanager/src/java/org/hibernate/ejb/packaging/XmlHelper.java b/entitymanager/src/main/java/org/hibernate/ejb/packaging/XmlHelper.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/packaging/XmlHelper.java rename to entitymanager/src/main/java/org/hibernate/ejb/packaging/XmlHelper.java diff --git a/entitymanager/src/java/org/hibernate/ejb/transaction/JoinableCMTTransaction.java b/entitymanager/src/main/java/org/hibernate/ejb/transaction/JoinableCMTTransaction.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/transaction/JoinableCMTTransaction.java rename to entitymanager/src/main/java/org/hibernate/ejb/transaction/JoinableCMTTransaction.java diff --git a/entitymanager/src/java/org/hibernate/ejb/transaction/JoinableCMTTransactionFactory.java b/entitymanager/src/main/java/org/hibernate/ejb/transaction/JoinableCMTTransactionFactory.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/transaction/JoinableCMTTransactionFactory.java rename to entitymanager/src/main/java/org/hibernate/ejb/transaction/JoinableCMTTransactionFactory.java diff --git a/entitymanager/src/java/org/hibernate/ejb/util/ConfigurationHelper.java b/entitymanager/src/main/java/org/hibernate/ejb/util/ConfigurationHelper.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/util/ConfigurationHelper.java rename to entitymanager/src/main/java/org/hibernate/ejb/util/ConfigurationHelper.java diff --git a/entitymanager/src/java/org/hibernate/ejb/util/LogHelper.java b/entitymanager/src/main/java/org/hibernate/ejb/util/LogHelper.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/util/LogHelper.java rename to entitymanager/src/main/java/org/hibernate/ejb/util/LogHelper.java diff --git a/entitymanager/src/java/org/hibernate/ejb/util/NamingHelper.java b/entitymanager/src/main/java/org/hibernate/ejb/util/NamingHelper.java similarity index 100% rename from entitymanager/src/java/org/hibernate/ejb/util/NamingHelper.java rename to entitymanager/src/main/java/org/hibernate/ejb/util/NamingHelper.java diff --git a/entitymanager/src/java/org/hibernate/engine/EJB3CascadeStyle.java b/entitymanager/src/main/java/org/hibernate/engine/EJB3CascadeStyle.java similarity index 100% rename from entitymanager/src/java/org/hibernate/engine/EJB3CascadeStyle.java rename to entitymanager/src/main/java/org/hibernate/engine/EJB3CascadeStyle.java diff --git a/entitymanager/src/java/org/hibernate/engine/EJB3CascadingAction.java b/entitymanager/src/main/java/org/hibernate/engine/EJB3CascadingAction.java similarity index 100% rename from entitymanager/src/java/org/hibernate/engine/EJB3CascadingAction.java rename to entitymanager/src/main/java/org/hibernate/engine/EJB3CascadingAction.java