did some fixes to the project structure