Pretty much Done

Finished reorganizing