Components refactor
Packaged and removed some unused libraries