Removed stupid structure and replaced with sensible.