Refactor, prepare Atmosphere 3.0.0