[feature/controller] Move main controller to controller directory

A few minor improvements to variables etc. were also added.

B3P-114