changes to address #31

moved folders around and it bypasses the causes #31 and fixes #31