structural recast
Making the project more MVC-like
Merge remote-tracking branch 'origin/Paint&Sound' into Paint&Sound