Restructured folder structure of project