Finish API, reorganize code and tests