Changed to proper directory structure.