removed dependency for double, merged port handling structures, cleared up to implement the rationale setter/getter

Signed-off-by: Jon Szymaniak <jon.szymaniak@gmail.com>
Merge remote-tracking branch 'upstream/master'