Cleaned up directory structure and fixed references.