Rename some things and move others around a bit. Going to clean up settings next.