Reorganized the directory structure