More package refactoring

Builds into separate jars