made into packages, main skeleton done