Refactor code, better projection modeling
Version bump 0.2.1