Began clean-up of directory structure/files.