Converted to multi-module project and added test project