Created initial classes
Merge origin/master