Reorganized structure of project