moved some files around for packaging purposes