removed "src/" from the beginning of module names