refactor file hierachy