Move core module classes into 'modules' subdirectory
Minor cleanups