Sunny initialization reworked
Refactored all code ready for tests and new features