Moved more files to resources