Cleaned up model folder
Fixed some pipe connection issues