tweaked file structure