remove sub classes into new files