refactor, simplified code structure etc
deleted useless files
Fixed bugs after some testing