Updates and cleaned up directory structure.