Rearraging files, and removing uneeded ones