Moved configuration to configuration folder.
Re-ordered init steps.