Changed around the file structure