Split across files, preserve object-orientation