Updated structure && remove deprecated items