Moved code around for ease of reusability
Added kata on p-1 factoring