substantial refactor. Project renamed