changed package names according to convention