Refactor package hierarchy
split Redirect static inner classes to proper classes
Move new classes into new hierarchy