moving to more standard 1 file per class layout