Changed directory structure to allow for localisation