Moved interfaces to appropriate locations and out of core