API-69 Refactor classes to resolve dependencies