removed core, worked on model, core stuff -> lib