Updated project structure properly.