Project separation

closes #20