removed old files, rearranged working files