Change strucrute, remove test packages and grunt, ready to dev