Cleaned it up a bit

Not using Eclipse's package dependencies.