Moved common assets into assets folder rather than duplication