Started reorganizing some things.