Renames remaining folders, closes #5