Reorganized core modules