Finished reorganization; added helper classes

REFACTOR *ALL* THE THINGS!!