Rename to new extensions
- code still needs tweaks, won't compile yet