Move into folders, Reorganize some script variables
Update prefabs