rework folder structure to seperate out the funcs & tests now for ms221