cleanup dir heirachy. Getting closer to having contextual help embedded on all screens ... still some issues remain