Revert "Removed everything non-essentual to mldap2 to make an "mldap-2.0""

-- This didn't do what I thought it would do. --

This reverts commit 4d8e76cbbbb9e95d9ec4882acd9b2d29772320f7.
Merge branch 'mldap-2.0'
Removed redundant subdirectory.