Clean up

Removed sub-packages - now in separate packages