Renamed various folders to work with yeoman