Completed more work on basic classes
Merge remote-tracking branch 'origin/master'
Some renaming