File structure change

reorganized the file tree