Some structural changes

latest commit 6e672f912e

LaPingvino authored May 8, 2010