Add grunt copy
Re-structure