Tweaked file structure a little