Refined the directory structure