Moved interface definitions to the relevant files