Split package

Move my own code to my package