moved extensions/ dir to entities/ to make it more consistent
Merged from master and resovled