Modify structure and add test directory
WIP