Restructure of resource handling and classes
Move seldom used methods into Extension
changed resource class names