Restructure all the classes
Further restructure prediction methods