Moving files.
Adding entity deletion check.
Merge branch 'master' of github.com:fclairamb/m2mp