Altered module system so it is consistent with the directory structure