Restructure classes into objects
If conditional