Reorganized code again & Began splitting functions into their own classes