Rearranged files and removed temp