Correct ordering of modules for build