begin to create some order
Ready for Serguey to commit his changes.