Added folder select dialog and fixed more namespace inconsistencies