renamed module namespaces to reflect the file structure