Many tweaks. Moved dirs.