Moved resources
Refactored classes