lots of renaming and cleaning up unnecessary files