got rid of all the folders, too confusing
fixed merge conflict