changed the folder structure according to new directions. Related to #4