move source into more appropriate hierachy