Moved classes & more defs