simplification + add packager
simplification