Refactors & Moves

This piggybacks on #131 and moves some content around to make the files a little more readable.