Leftovers from previous naming. Also, adding the option of enabling the test folder.
Removing unused (so far) folders
Fixing some compilation errors in Map