Sort out statics with the new directory structure