Changed names of folders, added test files