Started reorganizing stuff a little