changed package names & removed unused main methods