Changing directory structure to make it installable using devtools