removed files from old locations to new locations, added more tests