Cleanup, continue to modularize core/alpha