Major code cleanup
Adding eSolid Base