Update module skeletons

This pull requests contains the other ( #44 ) implicitly, therefore, accepting this one, should
autmoatically accept both.