Refactored classes and parameters to make sense


Signed-off-by: parhamfh <parhamfh@kth.se>