Reasonable layout and some reorganization