Organize package and import declarations and add package object aprikot
Format all Scala source files with Eclipse
Merge branch '#24' into 0.3.x - for some work