Reorganize file in packages