removed module name assumptions and redundant files