Add staff tag support

Rename lib directory
Refactoring