refactor form related sources
refactor sample project