Fixes #23 - Restructure initialization system