resourceFactory move, resourceManager refactor