Moved resources into own files
cleaned up imports