Split files up.
Fixed naming.