Refactor project to prepare for Java API.