Added ResourceManager
Reorganized