Moved resources and fixed Exceptions