Class separation in diff. files.