Added shifter code

Also changed names for some files