removed unused code
renamed packages
deleted original files