First step Re Organization code