Replace manual synchronization with a synchronized list.
Update settings
Reorganize package structure