Restructure 2 to include wp- files