Updated starting to package and adding datastructures