A little cleanup

Moving directories to make things clearer.