Removed unwanted files and added IContext interface