Split to files, move to own dir, rename classes