Modified package names to work with Eclipse/Maven