Clean up skeleton and module import stuff

This isn't for merging, just to be used as a basis for discussion. Let me know if you know of a better way.