Improve sources app model sub classes and inheritance handling
Fix capitalization
Remove unused code