Cleanup, refactor
Added example project