removed folders, tests all passing