Refactor basic sctucture + add Contracts to Providers and LyricsWikia