move Fluid to common/model/
fix javadoc, delete unused imports
use Inheritance.callSuper to chain reset calls to supertypes