Merged Ben's work in
Modified file structure