Adding files and do some refactoring