Split into 2 project, Issue #6