redundant functions removed
got rid of subfolders and reorganized functions