Properly move include and client file in "system" subdir