Combined classes into one file