Hi again,
before you start again … please follow these steps exactly. I´m pretty sure, that you have a mess in your scenery-file (content.xml) and therefore some package overwrite our package.
Again, follow these steps please and after then, try it again … you don´t need to remove anything from your community-folder. Let all as it is. It´s a bad recommendation to move all out of the community folder before the sim will be updated. Useless for you as customer/user, only important for ASOBO/MS - but it results in such issues.
Let me know, if the “re-org” has helped please 
Cheers,
Richard