Resolve "Clean-Up and Modifications towards the latest merge !22"

Closes #38 (closed)

Clean up regarding:

• imports (together with opt_tools modifications),
• old code,
• naming.

Modifications to the overall structure will be addressed in upcoming issues.