Uncommented code
Reorganizing packages