Renamed modules; fixed imports; fixed subresource access