reorganize folders and config files