Re-arranged directory structure.