Fix #30, swap factory to plain constructors.
Update project files a bit.