Made the directory structure clean