Moved ps1 files to appropriate folders and upated the base psm1 file.
Reorganizing for the rewrite of modules to the Az cmdlets