Continue cleanup. Main 'classes' are designed and linked in now