Fixes dependency hell
Fixed two_controller template and added specialized Relay template