Modularizing the classes into separate files.