Extracted interfaces and removed public modifiers
Added files