re-arranged everything

re-arranged everything