Moved definitions out of functions file into a separate definitions source file.
Added sourcing of common definitions file.