Moved classes to API package, introduced consumer