Moved some defs to another repo