reorganize files for the proper revamp