Aaron's update to file structure