Moved interface to contract directory.
Removed unused includes.