Clean up messy files, get everything in right file