Entity files

Not complete, I ended up trying to redo it to fit better :(