further cleaning reorganized directory