Updated project structure again
Updated project structure again