moved directories part two
minor changes