Restructure of core services project classes.