Recompile, further restructure