Restructuring folders, classes, and models
Merge remote-tracking branch 'origin/master'