Merge pull request #383 from y-higuchi/refactor_phase1

Floodlight refactor phase1