Move extensions to folder and namespace