changed names to some files to make the work cleaner
added other files to make work cleaner