Restructure and add additional project files