Reorganized file structure to make turnin easier