Altered namespace and folder structure