v3.4 - moved some files