project structure is refactored to standard project structure