Relocated remaining cases to standalone files