Moved interfaces to respective subpackage