overhauled file structure -KL