Minor changes to src structure to make delineation between CLI and GUI implementations