Reorder file loading
Remove new module parameter
Get build 0.0.2