Reformatting layout.
Removing obsolete files.