Cleaning up directory structure and various small improvements.