switched to pbzip
Moved some files around