Basic 716

Moved feature extensions to /modules