Refacatoring some files.