Renaming files and cleaning up bugs