Changes to regex and directory structure