Add new module Control.Functor
Move Control.Functor to Data.Functor
Add Logic.Basic
fix module name