changed package names to comply with new directory structure
deleted old main files