Moving singular resources into separate modules