0.6.1

updated structure