Changed project hierarchy
Forgotten files
Updated project structure