Changed around the directory structure :sparkles: