Created class model skeleton. Now we just need to refactor existing functionality.