fixing general project layout