split classes, see #1
fix php 5.4 strict warnings, see #1