Totally refactor into a single executable and a single module