added a setup and restructured the dir for it