Added permutation and bootstrapping.
Cleaning up unnecessary modules