Restructure
Add first testcase