fixed some imports
adding improved package stuff
merged package branch