restructured project layout