Fix package and imports