Changing restructure to better allow for submodules
shifting some functionality around