Updated more structure, starting to clean up a bit too.