Stellar types reorganization

Closed Sep 20, 2018 100% complete