Fix some problems on forge #771.
- Duplicate MODs error.
- Change some package layout.

Signed-off-by: EnderAlice- <enderalice@yahoo.com>