files renamed, db schema changes
Removed redundant variable scope
Removed extra /