Big class restructurings to make everything autoloadable