removing functional
Adding the functional lib properly with submodules