Added in all basic modules
Updated links