Reorganising whole structure to include a logic class