File structure update. Minor style tweaks.