Reworking tracker
Working on stuffs
Removed user package