Restructure models modules