Removed Interfaces and updated accordingly.
- Forgot to checkin new repo.