restructured files. fixed namespace from rml path