Reorganizes core and generic modules into separate directories