Moved cave and maze into gen