Struggled with #95 but could not solve it.
Simplified the package structure, will probably group some stuff together later on.