Adding the refactored, testable version of the app