changing how and where files are declared, updating tests