clean up, moved some files