reorganize packages and folders