reorganize files, delete unused