Moved files to standard directory for forge support