#20 maintaining canadensys package structure. Make work first, refactor later.