Restucturing free class