Started adding modifier objects
Reworked directory structure