entirely changed design
removing extra files