changes from code review
re-structured app
Colletcion Migration in progress
continued migration to collections