Updated files with latest content from app update.
Moved some directories around.