Refactored fluid classes
Added TODO file