Architectural changes for bower/coffee support
New architecture