renamed files and wroked more on the main file