changed import names to be part of the github qualified path