Moved data annotations into the mapping classes, moved the mapping folder into the data folder, changed the names of controller functions and parameters to fit the mold