Suppressed silly warnings, moved interfaces to separate package.