restructured folder
with unit test