Moved interface classes to new package