I decided that I need to rewrite everything from scratch. I need to think of some design and make my code follow it, not just to "make something work". I don't know when I'll get started with it.
First thing on my list is custom gui for irrlicht. If I succeed with that and the code will look clean/good enough I'll try to rewrite my entity framework.
Though as I said before, it might take a while to get started.