Updated project structure
Updated project structure, minor refactoring