added more cases/moved some files