Final Commit

renaming and such