Resctructered and added directories.