cleanup of unused stuff
simplified and clarified directory configuration