reorganize files and clean up stuff