Directory sorted out
Still struture organizing.