moved all modules to common scheme.
had to change the names of output files to make things uniform.