moving source files around to make collapse work