Moved API classes to a separated project