remove half-assed validation code. will replace with something better at a later point.
organize classes a little better.