Moving structure management to another class for clarity's sake