Code cleaning & reordering packages