Modularization continues

Creating more base classes to handle things later on