Reorganized files into subfolder module.