Added more files
Refactoring