clean up and reorganize files a bit