Recreated many things

Rebuilt some stuff from scratch after a stupid mistake