General prefabs and cleanup

Everything should work, I just made a separate branch to double check the commit was correct.