Add grunt, reorganize files