Moved and rewriting
packages and and reworks
It fully works again

Still need to add Factory's
Changed maping
Added lots of things