Restructure project to more easily facilitate testing + clean-up