Modularize classes, tests, and executable