Move files around and rename namespace to prep for more util classes