Integrated both projects through core package.
Code cleanup. Removed old Drivers.