Re-organization of code
Addition of usage tracking