Convert "hijack" to directory structure more like an app as opposed to a gem
Update TODOs