Changed directory structure to match submission model