Added license headers and moved trantor-specific code