added new subnet and vpc controllers, standardized some other stuff