organize structure of analysis

Modularizing is almost done.
how to deal with "" in booking type should be more wored on.