OK, I fixed this, rebasing so it might take a while. So next is the CSS files. Is there any reason to keep scripts and modules to separate files?