HUGE refactoring of module paths and reorg of module import statements
Re-add project membership post requirements (somehow these were removed)
Fix erroneous call in test case (which was causing tests to fail)
Merge branch 'feature/modules' into feature/refactoring