Rewrite Project & User resources.
Merge branch 'refactoring'