Improved build configuration
Flattened function class hierarchy