Organize code

@author: Guillaume
create Constellation

@author: Guillaume
Merge origin/master
organize code

@author: Guillaume