Adding files for the reafctorization