Moved resources to subfolders, updated references in files