Renamed controller -> runner
Refactored package and file structure