Reordered the file structure