Move out all files from jfritz packages 2