Move prealpha up
Small refactors