Project restructured finally