Increase file hierachy one level to reduce complexity