Moving files around and changing project structure