Modularized extentions

this is not really a merge request. but please take a look.