Move C sources into ext dir
Some make fixes
Fixes