Restructure Project Libraries