Restructing project folder structue