restructured project folder hierarchy