Yet another cleanup
Added loads of prefabs