Working Copy of projet
Refractoring done. Should be finished project