Changing folder structure and namespace
Added a few simple tests