Fixes several architectural issues and inconsistencies
Removes unused class files
Merge pull request #402 from jorgesilva/develop

Fixes several architectural issues and inconsistencies