main file splited
small changes