Step 2/10 - Start cleaning/redoing the core files

This is an intermediate step; nothing is close to done yet.