Moving code around, simplifying API interface and releasing 0.6.0