Reorganizing themebase into core - client for easier upgrade