Re-arranged the directory structure.