Few more changes to project structure