V0.09

Further division and clean ups.