Refactored project structure. Added project name