Reverted extra files to make the first commit cleaner.