Added Code Completion and New File Wizard , refactoring required