moved collections to lib folder
moved router to lib folder
code clean up