fixing some minor issues with the new project layout