Moved everything into the package 'aritzh'