Added namespace, class and alias resolution.
Removed workbench folder.