Alligning to wishbone 0.4 release
Adding modules
standardize on wishbone 0.4