A bit more organizing, nothing API related