Little reorganization and removing __future__

(removing __future__ for the time-being)