Intermediate commit passes the nose tests
Various changes - moving to another folder