moves classes which provide public API for end users to own scope