Add P1 and removed unused files