Decided to change the structure to not include the modules directory. Seemed pointless :)