Simplified directory structure, and miscellaneous corrections.