Revision to directory structure, use shared activity folder for both.

Reusable components and icons can be accessed by either, eliminating redundancy.