*Remove deprecate warnings
*Project reorganization