Recreated core prefabs and removed redundancies