Rearranged files and removed unnecessary files