Migrate to Pierc and re-design directory