Moved definitions to own sub-directory