Move files to the correct location

Also adds a maven check so 2.2 does not build if 2.1 files are left around
Merge pull request #3051 from systay/clean-2.1-files

Move files to the correct location