updated parent classes
folder Core moved under new Unit folder for consistency