moved some classes, added layer manager