Move everything to the same package