1.5.0-pre Folder cleanup re: #331