some clean-up and addition of required file structure