BIG restructuring --> moved logger etc into separate packages