rename wrongly named folder; reorganize some files