added resource factory to manage resources, tested for observation works
more resource restrucuring
more resource restrucuring