Splitting aspects

If it makes sense in a module, it's moved there