moved files into packages, added callback functions, fixed some stuff
moved files into packages, added callback functions, fixed some stuff