Major refactoring. Started work on Fluid, Item & Energy frame parts.