Rename folders and some bugfixes