Trying to modularize everything

Taking steps backwards to leap forward... Or that is the thought