Refactored directories and files for module based tree.