V0.2.0: bugfix/light class restructure