Issue #7 -> Files moved to main project.