Revert "moving extension files outside of main directory"

This reverts commit fa10adef341e9893e153e6e5b12c8990d6512df0.