Better init structure

:warning: No Merge Yet :warning: 

Relates to issue #17