Refectored packages
fixed merge