Organizing code
Some code updates