First set of changes to make things more modular (maybe)
Moving things around