Removed the .inc from the file names to try and match PSR-0
Merge remote-tracking branch 'origin/master'
Removed composer namespaces to try and match PSR-0