Changed some dirs
Checking dirs
Checked lib routes
Merge remote-tracking branch 'upstream/master'