Some refactoring & fixes, new sample project