A bit of reorganization (mainly for Compose.jl)