Restructured the folders, added data structures