Restructure the working solution and adding API project