Changed directory structure to fit SBT in the future.