Split the private class into a separate sourcefile