xinitrc added. Small reorganization