moved folder structure to the correct namespace