Removed some files and directories
Added interfaces for providers