Class names now namespaced, package layout adjusted accordingly