Few fixes in project structure