moved files around ticket:8