[CLEANUP] - Refactoring launcher out into single purpose classes, unit testing, etc