Refactorying data folder.