Organizing code

Organizing code