update file structure
update tests' require statements to work with updated project folder strucutre