build fix, moved files