rearranged entries
(cherry picked from commit d9d03b1)
rearranged code
(cherry picked from commit d9d03b1)
rearranged entries
(cherry picked from commit d9d03b1)
add new files
clean up code
add taas
clean up code
automatic resource management