Revert "new structure"

Reverts Cuel/ang-proj#2