Clean up skeleton and module import stuff
Merge pull request #1 from brzpegasus/module-import

Clean up skeleton and module import stuff