Reconfigured project from default structure

Various other readability changes
Merge remote-tracking branch 'origin/master'