Cleanup of code. Added providers folder.