Migrated directory structure to Maven style