Restructure the project for simplicity
Merge remote-tracking branch 'origin/master'