Added other files
fixed swaping & some method names