1.7.10 Update

Reorganized a lot of the code for a cleaner directory.