reorganize files and update config