Placed some classes in another folder