Changed package names

so that they match how i set up eclipse. Let's have a talk about it.