Refactored pipe connections
Move energy storage values to Machine