Moved module definitions to the proper header file.