Make heavy organizational changes after review by Denis
Remove useless file