refractored package layout (srry it was killing me!) tried testing some
sql stuff, failed miserably